From 912ad78cc5061de9e36064e291cf07424603bbf8 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Sat, 6 Nov 2010 12:40:15 +0100 Subject: [PATCH] Remove GTK_REGION_DEFAULT GTK_STYLE_CLASS_DEFAULT is preferred to match a default area, as it doesn't make sense to have a per-region default. --- gtk/gtkcssprovider.c | 5 ----- gtk/gtkenums.h | 2 -- 2 files changed, 7 deletions(-) diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c index eaf952c4f2..eaf850b944 100644 --- a/gtk/gtkcssprovider.c +++ b/gtk/gtkcssprovider.c @@ -463,7 +463,6 @@ enum ParserSymbol { SYMBOL_NTH_CHILD = GTK_STATE_LAST, SYMBOL_FIRST_CHILD, SYMBOL_LAST_CHILD, - SYMBOL_DEFAULT_CHILD, SYMBOL_SORTED_CHILD, /* Scope: nth-child */ @@ -691,7 +690,6 @@ create_scanner (void) g_scanner_scope_add_symbol (scanner, SCOPE_PSEUDO_CLASS, "nth-child", GUINT_TO_POINTER (SYMBOL_NTH_CHILD)); g_scanner_scope_add_symbol (scanner, SCOPE_PSEUDO_CLASS, "first-child", GUINT_TO_POINTER (SYMBOL_FIRST_CHILD)); g_scanner_scope_add_symbol (scanner, SCOPE_PSEUDO_CLASS, "last-child", GUINT_TO_POINTER (SYMBOL_LAST_CHILD)); - g_scanner_scope_add_symbol (scanner, SCOPE_PSEUDO_CLASS, "default", GUINT_TO_POINTER (SYMBOL_DEFAULT_CHILD)); g_scanner_scope_add_symbol (scanner, SCOPE_PSEUDO_CLASS, "sorted", GUINT_TO_POINTER (SYMBOL_SORTED_CHILD)); g_scanner_scope_add_symbol (scanner, SCOPE_NTH_CHILD, "even", GUINT_TO_POINTER (SYMBOL_NTH_CHILD_EVEN)); @@ -1304,8 +1302,6 @@ parse_nth_child (GtkCssProvider *css_provider, *flags = GTK_REGION_FIRST; else if (symbol == SYMBOL_LAST_CHILD) *flags = GTK_REGION_LAST; - else if (symbol == SYMBOL_DEFAULT_CHILD) - *flags = GTK_REGION_DEFAULT; else if (symbol == SYMBOL_SORTED_CHILD) *flags = GTK_REGION_SORTED; else @@ -1496,7 +1492,6 @@ parse_selector (GtkCssProvider *css_provider, if (symbol == SYMBOL_FIRST_CHILD || symbol == SYMBOL_LAST_CHILD || symbol == SYMBOL_NTH_CHILD || - symbol == SYMBOL_DEFAULT_CHILD || symbol == SYMBOL_SORTED_CHILD) { GTokenType token; diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h index 44fa55b120..cc66e3904c 100644 --- a/gtk/gtkenums.h +++ b/gtk/gtkenums.h @@ -587,7 +587,6 @@ typedef enum * @GTK_REGION_ODD: Region has an odd number within a set. * @GTK_REGION_FIRST: Region is the first one within a set. * @GTK_REGION_LAST: Region is the last one within a set. - * @GTK_REGION_DEFAULT: Region is the default option. * @GTK_REGION_SORTED: Region is part of a sorted area. * * Describes a region within a widget. @@ -597,7 +596,6 @@ typedef enum { GTK_REGION_ODD = 1 << 1, GTK_REGION_FIRST = 1 << 2, GTK_REGION_LAST = 1 << 3, - GTK_REGION_DEFAULT = 1 << 4, GTK_REGION_SORTED = 1 << 5 } GtkRegionFlags; -- 2.30.2